Merge branch 'core104' into next

diff --combined make.sh
index efbdfb856c70af6fcb8fb697b10de1f5fe091a0b,ff12307fb11571fc6af69a4138bb63da306cf1e4..1c832d016fd8757fd722cc2a5addb81a0b3f4d42
--- 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.19"                                                        # Version number
  CORE="104"                                                    # Core Level (Filename)
- PAKFIRE_CORE="103"                                            # Core Level (PAKFIRE)
+ PAKFIRE_CORE="104"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -708,7 -708,6 +708,7 @@@ buildipfire() 
    ipfiremake spice-protocol
    ipfiremake spice
    ipfiremake sdl
 +  ipfiremake libusbredir
    ipfiremake qemu
    ipfiremake sane
    ipfiremake netpbm