ENH: move changes from main tree to branch
7 files changed