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