openjdk bug is fixed (but not yet in)
Merge remote-tracking branch 'origin/master'