Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --cc config/rootfiles/oldcore/191/filelists/dhcpcd
index 0000000000000000000000000000000000000000,1e799dabb452f2b8288f0effc0685d81563dd0ca..1e799dabb452f2b8288f0effc0685d81563dd0ca
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/191/filelists/dhcpcd
+++ b/config/rootfiles/oldcore/191/filelists/dhcpcd

diff --cc config/rootfiles/oldcore/191/filelists/files
Simple merge

diff --cc config/rootfiles/oldcore/191/filelists/squid
index 0000000000000000000000000000000000000000,2dc8372a0e9d9aaca240a1cbfd9e423f84222337..2dc8372a0e9d9aaca240a1cbfd9e423f84222337
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/191/filelists/squid
+++ b/config/rootfiles/oldcore/191/filelists/squid

diff --cc config/rootfiles/oldcore/191/update.sh
Simple merge

diff --cc make.sh
Simple merge