Merge remote-tracking branch 'remotes/upstream/master' into merge-from-upstream

Conflicts:
	Makefile
	examples/fail/input_zh-CN.md
	examples/panic/panic.rs
	examples/result/try/try.rs
	examples/staging/hash/hash.rs
	examples/staging/hash/smallintmap/input_zh-CN.md
	examples/staging/hash/vecmap/vecmap.rs
	src/example.rs
	src/file.rs