Redmine#4170: adapt to overlong module lines
Merge pull request #1366 from tzz/bugfix/4170-long-module-lines

Redmine#4170: adapt to overlong module lines