Merge remote-tracking branch 'origin/master' into scopedNS

# Conflicts:
#	tests/elab_fail/versoDocMissing.lean.out.expected