Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 2f74cf27ad6fbb852df78bcccca1fb645c8a57e0

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