AUI-1106 Source formatting
Merge branch 'master' into master-deprecated