Apply patch-2353967-9

Drupal Issue: https://www.drupal.org/node/2353967
Patch: https://www.drupal.org/files/issues/console-2353967-9.patch