Commit 6e1738cb authored by Björn Bartels's avatar Björn Bartels

Merge branch 'release' into 'master'

Merge branch 'master' into 'release'

See merge request !16
parents ae60e138 0f54b801