GitHub pull request #1566 of commit 5e863d716a08b9246388c6935f4208c668086e2a, no merge conflicts.
Aborted by user eburn