Fixes #611
Merge branch 'master' of http://github.com/phalcon/zephir