Latest patch from https://www.drupal.org/node/1949682