GitHub pull request #861 of commit 5a1fdfcc4fdb5a62741250ea89f1824e1b8155bb, no merge conflicts.
This run spent: