Merge branch 'dns-dnssec' into 'stable-3.1'

Marius Burkard

2016-01-29 b8f4caccb73052b9d7488b592ed4854958a4dc76

1
ALTER TABLE `client` CHANGE `company_id` `company_id` VARCHAR( 255 ) NULL DEFAULT NULL ;