rob 3b20be8d19 merge r25072 to release-1.12 13 anni fa
..
Zend 3b20be8d19 merge r25072 to release-1.12 13 anni fa