Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

 interface/web/dns/form/dns_spf.tform.php

@@ -127,7 +127,7 @@
               'range' => '60:',
               'errmsg'=> 'ttl_range_error'),
         ),
         'default' => '86400',
         'default' => '3600',
         'value'  => '',
         'width'  => '10',
         'maxlength' => '10'