old version, do not use
Merge remote-tracking branch 'origin/master'

Conflicts:
	PythonPrototype/OpenGLVisFunc.py
	PythonPrototype/TestEnvironment.py