Merge branch 'master' into docking

# Conflicts:
#	examples/example_apple_opengl2/main.mm