Merge pull request #1157 in master
Fix namespace paths for Zend\Cache\Storage\Plugin classes.
Merge pull request #1188
Merge pull request #1188 in develop