Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-22 17d53616b36fef3b753fc408bfc600f360673333

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