Merge branch 'hotfix/ZF2-460' of https://github.com/pdobrigkeit/zf2

src/Model/ViewModel.php

@@ -144,8 +144,7 @@ public function __unset($name)
             return null;
         }
 
-        $variables = $this->getVariables();
-        unset($variables[$name]);
+        unset($this->variables[$name]);
     }
 
     /**

test/Model/ViewModelTest.php

@@ -82,6 +82,13 @@ public function testSetVariablesMergesWithPreviouslyStoredVariables()
         $this->assertEquals(array('foo' => 'bar', 'bar' => 'BAZBAT'), $model->getVariables());
     }
 
+    public function testCanUnsetVariable()
+    {
+        $model = new ViewModel(array('foo' => 'bar'));
+        $model->__unset('foo');
+        $this->assertEquals(array(), $model->getVariables());
+    }
+
     public function testCanSetOptionsSingly()
     {
         $model = new ViewModel(array(), array('foo' => 'bar'));