fix php 5.4 related issue
Merge remote-tracking branch 'origin/master' into studip-2.2