Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/58/filelists/files
	make.sh

diff --cc config/rootfiles/core/58/filelists/files
index 047127e7e540163ff1e298e2f6e55a09b7b68574,afb3d99699a10fd796893194442e5f366ef066c5..19d98e57cf666d6bd31c6ce3da16b59942d92c45
--- 1/config/rootfiles/core/58/filelists/files
--- 2/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@@ -1,7 -1,3 +1,10 @@@
  etc/system-release
  etc/issue
  etc/vimrc
++<<<<<<< HEAD
 +srv/web/ipfire/cgi-bin/index.cgi
 +srv/web/ipfire/cgi-bin/ovpnmain.cgi
 +var/ipfire/general-functions.pl
 +var/ipfire/langs
++=======
++>>>>>>> master

diff --cc make.sh
Simple merge