Merge branch 'master' into pair-as-my-user