Merge remote-tracking branch 'upstream/master' into fix-for-issue2907-with-no-formatt...