Update revision to 3.7.2.1
Merge branch 'maint'

Used merge strategy -s ours to skip release commit.
Merge branch 'master' into next