ENH: merge from main tree
7 files changed