Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 0c6ca563001ffeaf12081a26f226bf0cab543b65

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