PHP 5.3 compatibility fixes
Merge branch 'release/1.0.0-alpha14'