Checkstyle updates
Merge origin/master