GitHub pull request #838 of commit df0f7bba4fd2344ab3a8187b7ba2bc39afaec2cd, no merge conflicts.
This run spent: