Merge remote branch 'remotes/origin/develop'

.gitignore

CMakeLists.txt

cmake_support/OST.cmake

deployment/linux/create_bundle.py

deployment/macos/deploy.py

deployment/macos/deps.py

doc/conf/conf.py

doc/make.py

examples/code_fragments/dokk/datafiles/hud.ini

examples/demos/gfx_mapslab.py

examples/demos/the_hammer.py

examples/gfx/ambient_occlusion1.py

examples/gfx/ambient_occlusion2.py

examples/gfx/hsc_hemilight.py

examples/gfx/shadow_mapping.py

examples/gfx/transp.py

modules/base/pymod/__init__.py

modules/base/pymod/stutil.py

modules/base/pymod/wrap_base.cc

modules/base/src/export_helper/generic_property_def.hh