fix indentation, replace tab chars
wrap long lines
Merge branch 'master' into maven