GitHub pull request #656 of commit eed46287ebed285192102c5613f66fc321b009af, no merge conflicts.
This run spent: