[sr-dev] git:3.1: Merge remote branch 'origin/master' into 3.1