Fix merge master into nightly (#45) #31

Job	Run time
Configcheck	22s
build_firmware (ar71xx-generic)	22s
build_firmware (ar71xx-tiny)	16s
build_firmware (ar71xx-nand)	15s
build_firmware (ath79-generic)	16s
build_firmware (brcm2708-bcm2708)	14s
build_firmware (brcm2708-bcm2709)	15s
build_firmware (ipq40xx-generic)	7s
build_firmware (ipq806x-generic)	21s
build_firmware (lantiq-xrx200)	15s
build_firmware (lantiq-xway)	18s
build_firmware (mpc85xx-generic)	18s
build_firmware (mpc85xx-p1020)	6s
build_firmware (ramips-mt7620)	6s
build_firmware (ramips-mt7621)	17s
build_firmware (ramips-mt76x8)	16s
build_firmware (ramips-rt305x)	6s
build_firmware (sunxi-cortexa7)	1s
build_firmware (x86-generic)	1s
build_firmware (x86-geode)	1s
build_firmware (x86-legacy)	1s
build_firmware (x86-64)	1s
build_firmware (ar71xx-mikrotik)	15s
build_firmware (brcm2708-bcm2710)	17s
build_firmware (mvebu-cortexa9)	14s
	5m 1s

Provide feedback