Fix for some stupid java compile errors (on only specific versions of java)
Merge branch 'master' into unstable_staging