patch for https://www.drupal.org/SA-CORE-2014-005
Merge branch 'master' of github.com:nickveenhof/drupalcamp2014