Merge pull request #1585 from tpikonen/codestyle