Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

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