Merge branch 'master' into win32-gl-ui

Conflicts:
	Qt/Native.pro
Merge branch 'master' into win32-gl-ui