Backport Bot

This is all the backport the Scientific Python Bot has made.