Merge branch 'develop'

Conflicts:
	examples/examplescene.py
Merge branch 'develop'

Conflicts:
	examples/examplescene.py