Merged 'phalcon' branch.