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