commit e0ded6866b37da22092eaba6b766dc87fd85935e
Author: Joel Pittet <joel@pittet.ca>
Date:   Sun Sep 13 14:07:27 2015 -0700

    broken

diff --git a/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php b/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
index c81f65f..2e4564e 100644
--- a/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
+++ b/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
@@ -60,7 +60,7 @@ public function tokenForm(&$form, FormStateInterface $form_state) {
       $options[$optgroup_fields]["{{ $field }}"] = $handler->adminLabel();
     }
 
-    foreach ($this->view->display_handler->getHandlers('argument') as $handler) {
+    foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
       $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', array('@argument' => $handler->adminLabel()));
       $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', array('@argument' => $handler->adminLabel()));
     }
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index c9000a0..eebede9 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -1729,7 +1729,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
         // objects and t() may return a TranslationWrapper once issue #2557113
         // lands.
         $optgroup_arguments = (string) t('Arguments');
-        foreach ($this->view->display_handler->getHandlers('argument') as $handler) {
+        foreach ($this->view->display_handler->getHandlers('argument') as $arg => as $handler) {
           $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', array('@argument' => $handler->adminLabel()));
           $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', array('@argument' => $handler->adminLabel()));
         }