Commit 56ecf4fe authored by Björn Bartels's avatar Björn Bartels

Merge branch 'release' into 'master'

Merge branch 'master' into 'release'

See merge request !12
parents 37637d61 195e8a9e