Merge branch 'checkstyle' into gradle