Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 09b790e9c59c496ec1aa537ff7bfa21ca0f4b5cd

 interface/web/dns/dns_wizard.php

@@ -314,6 +314,7 @@
   $tpl_rows = explode("\n", $tpl_content);
   $section = '';
   $vars = array();
   $vars['xfer']='';
   $dns_rr = array();
   foreach($tpl_rows as $row) {
      $row = trim($row);