Update for latest Drupal Core issues

Drupal SA-CORE-2014-005 and SA-CORE-2014-004 updates