Merge branch 'master' into next

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

diff --cc config/rootfiles/common/initscripts
Simple merge

diff --cc doc/packages-list.txt
Simple merge

diff --cc lfs/initscripts
Simple merge

diff --cc make.sh
index 0b6e70e312e3c866b7941863b077c2e6d7f07fab,41ede31f412279373afddd51d5d07727df927abd..4d4529ff446af456bb6228f8c0bab5db791aa5df
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -644,7 -643,7 +644,8 @@@ buildipfire() 
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
 +  ipfiremake tcl
+   ipfiremake imspector
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild