Merge branch 'next' into temp-c164-development

diff --cc config/rootfiles/core/164/filelists/core-files
index 0000000000000000000000000000000000000000,f196f54d8a1bb09e7428ada786af5a791121cb7d..f196f54d8a1bb09e7428ada786af5a791121cb7d
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/163/filelists/core-files
+++ b/config/rootfiles/core/164/filelists/core-files

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

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

diff --cc langs/en/cgi-bin/en.pl
Simple merge