PSR-1 and PSR-2 coding styles
Merge remote-tracking branch 'origin/develop' into develop