Merge branch '1.6' of https://github.com/bunkerity/bunkerweb into 1.6

Merge branch '1.6' of https://github.com/bunkerity/bunkerweb into 1.6 #191