Merge branch 'develop' of git://github.com/zendframework/zf2 into fea…

…ture/cache-session-storage

Conflicts:
	CHANGELOG.md

src/AutoloaderFactory.php

@@ -94,7 +94,7 @@ public static function factory($options = null)
                     );
                 }
 
-                if (!self::isSubclassOf($class, 'Zend\Loader\SplAutoloader')) {
+                if (!static::isSubclassOf($class, 'Zend\Loader\SplAutoloader')) {
                     require_once 'Exception/InvalidArgumentException.php';
                     throw new Exception\InvalidArgumentException(
                         sprintf('Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class)