Merged. https://www.drupal.org/commitlog/commit/68075/8eb1f108ded97e2916ad775...