Upgraded to Checkstyle 6.1.1