Revert "Revert "Merge master into staging-next""

In 87a19e90 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c79. This was however wrong, as it "removed" master.

This reverts commit 0be87c79.