GitHub pull request #488 of commit ac89b95d3c1e2f46acba717df1669ee4a7cb5a4c, no merge conflicts.
This run spent: