Fixed PHP lint (BAC-20)
Merge branch 'dev' into phalanx-redoux