Upgrade core (https://www.drupal.org/SA-CORE-2014-005).
Merge branch 'release/v1.6'