I recently fixed a package.el bug on the emacs-25 branch, but it's
affecting a lot of people who are following master (and a lot of automated
tests out there run on master) so I'd like the fix to be applied on master
too.

Do we periodically merge stuff from the emacs-25 branch onto master? Or do
we merge only once (when the release is finalised)?