3.7 maintenance - Synchronize with HEAD after java 7 merge
2 files changed