Proper cross-platform ordering of function attributes.
Merge branch 'master' into compatibility