Commit f0aaf658 authored by Björn Bartels's avatar Björn Bartels

Merge branch 'dev' into 'master'

Dev

See merge request !5
parents d72a2d22 d032d641