Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less

less/reset.less

@@ -83,7 +83,8 @@ img {
 }
 
 // Prevent max-width from affecting Google Maps
-#map_canvas img {
+#map_canvas img,
+.google-maps img {
   max-width: none;
 }