Merge branch 'master' into stab_peek_mut

Author: lukaslueg

.gitattributes

@@ -9,6 +9,7 @@
 src/etc/installer/gfx/* binary
 src/vendor/** -text
 Cargo.lock linguist-generated=false
+config.toml.example linguist-language=TOML
 
 # Older git versions try to fix line endings on images and fonts, this prevents it.
 *.png binary

.mailmap

@@ -286,7 +286,7 @@ Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 York Xiang <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
-Yuki Okushi <[email protected]>
+Yuki Okushi <[email protected]> <[email protected]>
 Zach Pomerantz <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>