Extra nesting (tot 6) nodig.
Merge remote-tracking branch 'origin/patch-1'
(...)
Merge remote-tracking branch 'kn/master'