Fixing PHPCS errors caught by Travis
Merge develop into issue-649