Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-10 447c8380668b753c95f97ec2b87ff322e4aff002

1
ALTER TABLE `client` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';