Everything looks good. The patch still applies cleanly with an offset.
This should be committed to both D8 and D7.
Committed to 8.x. I can't see this causing many conflicts with other patches so seems OK for backport. Moving back for webchick to consider.
Committed and pushed to 7.x. Thanks!
Automatically closed -- issue fixed for 2 weeks with no activity.
Drupal is a registered trademark of Dries Buytaert.