Corrections according to https://www.drupal.org/node/2298559#comment-9230529
Merge