Details here: https://github.com/civicrm/civicrm-core/issues/1580
PR here: https://github.com/civicrm/civicrm-core/pull/1555