Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	HISTORY.rst
#	py_tools_ds/version.py
4 jobs for master
Status Job ID Name Coverage
  Test
canceled test_py_tools_ds #37534

canceled test_py_tools_ds_install #37536

canceled test_styles #37535

 
  Deploy Pages
canceled pages #37537