Merged upstream master

src/web/static/stats.txt

@@ -1,9 +1,9 @@
-129	source files
-49149	lines
+128	source files
+49196	lines
 1.9M	size
 
 63	JavaScript source files
-20966	lines
+21013	lines
 788K	size
 
 	uncompressed JavaScript size