blah
fix java 7 building
Merge branch '1.12'