Merge commit 'origin/master' into next

Conflicts:
	src/paks/linux-pae/uninstall.sh

diff --cc make.sh
index cc2d3c500799143e2df5ba28de2a8ebf759f3304,d5ec02c5a3c66a8906f769637eda1b9f35e1f0a1..a02dadb51cd3a10040f2f5e093362a3e59509bd0
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
- TOOLCHAINVER=2
 -TOOLCHAINVER=3
++TOOLCHAINVER=1
  IPFVER="full"                         # Which versions should be compiled? (full|devel)
  
  # Debian specific settings