Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-22 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf

 install/sql/incremental/upd_0011.sql

New file
@@ -0,0 +1,2 @@
-- use text for groups
ALTER TABLE `sys_user` CHANGE `groups` `groups` TEXT;