Builds with JDK 7, target 6.
Merge remote-tracking branch 'origin/master'