5.0.2 has error for php54 ... Fix this
Merge remote-tracking branch 'origin/master'