Bulk merge
Bulk merge branch merging the following merge requests:
- !137 (closed) with 9123bdb3
- !122 (merged) with 7d354e5f
- !126 (closed) with b37ee091
- !127 (merged) with 05112bfd
- !116 (closed) with 2ac172af
- !120 (merged) with b6faaef3
- !27 (closed) with 3e761e13
- !21 (merged) with 4cffabde
- !22 (closed) with b892d51c