Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-14 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a

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