Commit 77e7dfff authored by Björn Bartels's avatar Björn Bartels

Merge branch 'release' into 'master'

Merge branch 'master' into 'release'

See merge request !13
parents ff82a130 1539a0d8