moar jdk compatibility fixes+hacks
Merge remote-tracking branch 'origin/master'