Change code style to meet the new standard of PSR2 Scanner.
Merge branch 'master' into travis.yml-test