Fix for two checkstyle warnings I missed before pushing
Merge branch 'master' into unstable_staging