Enabled travis-ci on old branch
Fix: Bug with php 5.4
Fix: bug with php 5.4
Merge remote-tracking branch 'origin/3.3' into 3.3_backported