Merge remote-tracking branch 'origin/next'

diff --combined config/rootfiles/core/152/exclude
index 818039f4af91e75f71ab41de8cd55c54b5274a62,e7500a03d20578431240e0adee044496493c47a6..818039f4af91e75f71ab41de8cd55c54b5274a62
--- 1/config/rootfiles/core/151/exclude
--- 2/config/rootfiles/core/152/exclude
+++ b/config/rootfiles/core/152/exclude
@@@ -17,7 -17,6 +17,7 @@@ etc/sysconfig/firewall.loca
  etc/sysconfig/rc.local
  etc/udev/rules.d/30-persistent-network.rules
  srv/web/ipfire/html/proxy.pac
 +usr/share/xt_geoip
  var/ipfire/dma
  var/ipfire/time
  var/ipfire/firewall/locationblock
@@@ -26,7 -25,6 +26,7 @@@ var/ipfire/ovp
  var/ipfire/urlfilter/blacklist
  var/ipfire/urlfilter/settings
  var/lib/alternatives
 +var/lib/location/database.db
  var/log/cache
  var/log/dhcpcd.log
  var/log/messages

diff --combined config/rootfiles/core/152/filelists/libloc
index ff4a92429cb2937f76a27003ed1fe1ee80479bbc,0000000000000000000000000000000000000000..ff4a92429cb2937f76a27003ed1fe1ee80479bbc
mode 120000,000000..120000
--- 1/config/rootfiles/core/151/filelists/libloc
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/libloc
@@@ -1,1 -1,0 +1,1 @@@
 +../../../common/libloc