Merge branch 'beyond-next' into next

diff --combined make.sh
index b20d352331aa9e09f29c1f9c93627c129e3be2dd,3d9e3c3bc0197eb054c036fe608802ead7bda310..af76c59e3913dc480fae4944da1a1126b8327563
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.13"                                                        # Version number
  CORE="69"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="68"                                             # Core Level (PAKFIRE)
 +PAKFIRE_CORE="69"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -462,6 -462,7 +462,7 @@@ buildipfire() 
    ipfiremake libnet
    ipfiremake libnl
    ipfiremake libidn
+   ipfiremake nasm
    ipfiremake libjpeg
    ipfiremake libexif
    ipfiremake libpng
@@@ -523,7 -524,6 +524,6 @@@
    ipfiremake logwatch
    ipfiremake misc-progs
    ipfiremake nano
-   ipfiremake nasm
    ipfiremake URI
    ipfiremake HTML-Tagset
    ipfiremake HTML-Parser