Merge branch 'develop' into fix-warnings

Fixed Conflicts:
	examples/addons/threadedImageLoaderExample/src/testApp.cpp