Merge branch 'patch-1' into 'stable-3.1'

Marius Burkard

2016-03-14 65c80f1a80caed31a3e9322a90b13577fe87496e

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