Merge branch 'master' into 0.11.2

Dockerfile

@@ -2,8 +2,10 @@ FROM debian:stretch
 MAINTAINER Cajus Kamer <Cajus.Kamer@arcor.de>
 
 ENV GLUON_SITE ffdo
+
 ENV GLUON_TAG v2017.1.5
 ENV GLUON_RELEASE 0.11.5
+
 ENV GLUON_BRANCH stable
 ENV GLUON_BROKEN 1
 ENV GLUON_TARGETS ar71xx-generic ar71xx-nand ar71xx-tiny ar71xx-mikrotik brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7621 x86-generic x86-64