Merge in latest from scalastyle/scalastyle

Merging in latest.