Merge branch 'master' into syslinux-merge

bin/generate-zbm

@@ -11,6 +11,7 @@ use File::Basename;
 use File::Temp qw(tempfile tempdir);
 use File::Copy;
 use File::Path qw(make_path remove_tree);
+use Sort::Versions;
 
 use Data::Dumper;
 $Data::Dumper::Indent   = 1;

cpanfile

@@ -0,0 +1,2 @@
+requires 'Config::IniFiles';
+requires 'Sort::Versions';