Included changes from stable that could not be merged

Marius Cramer

2014-01-28 746e52a6f3cfdd6438f9c62b39c119925a9405f9

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