MAINT: Sort backports to make applying easier.
Merge pull request #1202 from jseabold/sort-backports

MAINT: Sort backports to make applying easier.
MAINT: Fix last commit.