Merge branch 'master' into newmc

Conflicts:
	make_static.PL

diff --cc Makefile.PL
Simple merge

diff --cc make_static.PL
index 24e56a8bfcb67c370dc26cc84e26043a49ad90fc,9fd5bcaf62916cb024ac8c59c07f7030a2ff1772..06c9eeea791cd9e8da281f4d43fbb576d1398c4e
--- 1/make_static.PL
--- 2/make_static.PL
+++ b/make_static.PL
@@@ -6,7 -6,7 +6,8 @@@ use CSS::Minifier::XS qw/minify/
  use Digest::SHA qw/sha256_base64/;
  use IO::Compress::Gzip qw/gzip/;
  use File::Slurp qw/read_file write_file edit_file_lines/;
 +use SVG::SpriteMaker;
+ use File::Which;
  use List::Util qw/first/;
  
  mkdir 'static';