More JS->Java conversions
Merge remote-tracking branch 'origin/master'