Revert "Revert to v2.5.1"
Undoes !593 (merged)
619f0eaf979b2793526d20aa9f614c329a45b6cd was the state of the previous v2.5.2 release - except for a single newline in the CHANGELOG, we're returning to exactly that.
Please see this comment for more details on why this was necessary.
Edited by Adam Cohen