ready for release 3.1.2
Merge remote-tracking branch 'upstream/master' into suggest-v3.x