Commit 6ffddf55 authored by Florian Fuchs's avatar Florian Fuchs

Merge branch '3.1' into 'master'

Merge request containing all other merge requests targeted for 3.1 Closes #26, #3, #131, #161, and #90 See merge request !203
parents 8a3ed6ac bf7395be
Pipeline #6551814 passed with stage
in 2 minutes 43 seconds