Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/dns/templates/dns_soa_edit.htm

@@ -170,4 +170,4 @@
        searchFieldWatermark: '',
        resultBoxPosition: ''
    });
</script>
</script>