Merge branch 'release/7.x-0.11' into develop
alter options_subgroup to handle not-null default values
make query-language site-language dependent
Fix for hardcoded operators
Merge branch 'feature/905-cql_language' into develop
update release version
Merge branch 'release/7.x-0.12'