3.7.x

Merge the released changes for 3.7.1, and the version rollover to 3.7.2-SNAPSHOT, into master