Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

 install/update.php

@@ -378,6 +378,9 @@
      } elseif($conf['bind']['installed'] == true) {
         swriteln('Configuring BIND');
         $inst->configure_bind();
         if(!is_installed('haveged')) {
            swriteln("[INFO] haveged not detected - DNSSEC can fail");
         }
      } else {
         swriteln('Configuring MyDNS');
         $inst->configure_mydns();