Merge branch 'jc/refuse-push-to-current'