Commit 2f3016a4 authored by Willi Rath's avatar Willi Rath
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request !57
parents e4631b1b 2f14d4a5