ENH: push a few more changes to 2.4.8
3 files changed