Merge branch 'zendStudioDLTKProblems' of https://github.com/marc-mabe…

…/zf2 into hotfix/coding-standards

Conflicts:
	library/Zend/Mvc/Controller/ActionController.php
	library/Zend/Mvc/Controller/RestfulController.php

src/Wsdl.php

@@ -599,7 +599,8 @@ public function translateType($type)
             $type = substr($type, 1);
         }
 
-        if ($pos = strrpos($type, '\\')) {
+        $pos = strrpos($type, '\\');
+        if ($pos) {
             $type = substr($type, $pos+1);
         }