Including the most recent version of gcccpuopt from http://www.pixelbeat.org/scripts/gcccpuopt - on a Digital Ocean VM (and likely others) the build throws an unknown CPU warning.
Fix merge bugs
Fix merge bugs (2)
Fix merge bugs (3)
Updated gen-build.php
Use slow path for PHP 5.3 only; fix #851
Merge branch 'master' of git://github.com/mattpavelle/cphalcon into mattpavelle-master
Merge pull request #850 from sjinks/bug-fixes

Fix bugs introduced by merge conflicts
Merge pull request #852 from sjinks/issue-851

Best effort fix for Mongo's bugs