Batch merge
Bulk merge branch merging the following merge requests:
- !58 (merged) with 42be7fd1
- !284 (closed) with 9e94a149
- !283 (merged) with 0160454f
- !282 (closed) with f49295ac
- !275 (closed) with ca4b71e6
- !274 (closed) with 1e6524b2
- !232 (closed) with 005cbb40
- !229 (merged) with eef82f64
- !207 (closed) with d6b04816