Merge remote branch 'origin/master' into tzz-auth-source-rewrite