PHP_CodeSniffer and PSR-2
Merge branch 'develop'