moved some defines around
Merge branch 'release-master' into release-2.16