FIX php 5.3 compatibility
Merge origin/master