Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	lfs/iputils

diff --combined config/rootfiles/common/iputils
index 934b55509a0364d0712345ac7ab761b6f54d667a,7fb0426750b66e718fbcf4a589513b9d81228480..3484cbb244b04f177a8fef07ddf63066f1f03409
--- 1/config/rootfiles/common/iputils
--- 2/config/rootfiles/common/iputils
+++ b/config/rootfiles/common/iputils
@@@ -1,2 -1,2 +1,3 @@@
+ bin/ping
  usr/bin/ping
 +usr/bin/tracepath