Fix for php 5.3.
Merge remote-tracking branch 'origin/master'