Merge branch 'DisplayCache' into develop
Merge branch 'FixLookNoOp' into develop
Merge branch 'LookDescription' into develop
Merge branch 'PythonNamespace' into develop
Merge branch 'SearchPath' into develop
Merge branch 'TransformFile' into develop

Conflicts:
	src/core/OCIOYaml.cpp
Merge branch 'ViewDescription' into develop

Conflicts:
	src/core/Config.cpp