Avoiding escaping already escaped strings in PHQL
Merge branch '1.2.0' of https://github.com/phalcon/cphalcon into 1.2.0