fix to work with JDK 1.7 ordering
reformat
Merge branch '1.12'
Merge branch 'master' into pull-requests