GitHub pull request #479 of commit 2693b317fdc6ce394c561f6b0051465fa74ba41b, no merge conflicts.
This run spent: