Merge branch 'release/1.0.4' into develop
Remove stray comment.
Set correct default ruleset for PHPMD.
Merge branch 'release/1.0.5'