Testing code reformat feature of phpstorm and it looks GOOD
testing post commit refs #2000
Merge remote-tracking branch 'origin/master'