Removed php 5.4+ specific stuff for now.
Merge branch 'hotfix/0.0.7'