In doing this I'm breaking my own rules of not merging master into a
stable branch during the feature freeze. I'm breaking this rule for two
reasons:

1. Somewhere down the line I messed up picking commits into the stable
   branch and as a result I basically can't merge anything anymore
   without resolving 9000 merge conflicts.

2. All merge requests merged into master had the "Pick into Stable"
   label anyway except for one commit that bumps the version. As such
   merging master into this branch is not really different from picking
   things manually.