Phalcon 1.2.5 stubs
Merge branch 'master' into 1.3.x