Merge branch 'master' into 1.12-doc-updates

Author: puredanger

content/dev/contributors.csv

@@ -519,6 +519,7 @@ Justin Gehtland,jgehtland
 Arnaud Geiser,arnaudgeiser
 Maria Geller,mneise
 Marc Sabates Gelpi,marc-sabates-gelpi
+Hadil Sabbagh,hadils
 Christopher Genovese,
 Fred George,
 Daniel Gerigk,danielgerigk