7.x 1.x

Pull request for patching and version control at https://www.drupal.org/node/2295273