Merge branch 'hotfix/2834' into develop

Forward port zendframework/zendframework#2834

src/Resolver/TemplateMapResolver.php

@@ -97,7 +97,7 @@ public function add($nameOrMap, $path = null)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s: expects a string, array, or Traversable for the first argument; received "%s"',
                 __METHOD__,
-                (is_object($map) ? get_class($map) : gettype($map))
+                (is_object($nameOrMap) ? get_class($nameOrMap) : gettype($nameOrMap))
             ));
         }