Merge official phalcon port

Redports: ignore