Merge branch 'stable-3.1'

Marius Burkard

2016-04-06 df8e42319fc83110bd2db2b96b97367f42c71c6c

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