[nobug] branched for 3.1 maintenance
13 files changed