ZF-6571 - Merging r15533 from incubator to trunk
ZF-6571
- Merging r15533 from incubator to trunk


svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework