ENH: move stuff from main tree
2 files changed