Switch to Java 7
Fix broken test
Merge remote-tracking branch 'upstream/master'
more changes