Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-25 b01718a0ae2b53c18c01f1374799a00a0c11279f

1
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`;