Merge from Phalcon/1.3.0