Java 1.5 compat
Merge remote-tracking branch 'origin/master'