Merge branch 'master' into next

diff --combined make.sh
index 42655ab29ada5e284ef6a8f1193a83feab8f61fa,4e7eba2732bd94a812db184ec71b7d01a378a81f..90b7272bf0f19e226ad7b1aa409ab99cdaf8f799
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
- CORE="87-rc1"                                                 # Core Level (Filename)
- PAKFIRE_CORE="86"                                             # Core Level (PAKFIRE)
+ CORE="87"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="87"                                             # 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
@@@ -733,11 -733,9 +733,11 @@@ buildipfire() 
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
 +  ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 +  ipfiremake libsrtp
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch