Merge branch 'master' into next

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

diff --cc config/rootfiles/oldcore/123/filelists/i586/openssl-sse2
index 0000000000000000000000000000000000000000,f424713d6cb581803624487de681c16ad9eee73d..f424713d6cb581803624487de681c16ad9eee73d
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/123/filelists/i586/openssl-sse2
+++ b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2

diff --cc config/rootfiles/oldcore/123/filelists/xtables-addons
index 0000000000000000000000000000000000000000,2e24c4298bf0cc1f403ce5e52014319d3a86fb63..2e24c4298bf0cc1f403ce5e52014319d3a86fb63
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/123/filelists/xtables-addons
+++ b/config/rootfiles/oldcore/123/filelists/xtables-addons

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