GitHub pull request #480 of commit afe471d8e6226d7bc362b9140939363b0c7c1c46, no merge conflicts.
This run spent: