Commit 4ecf4467 authored Sep 26, 2019 by Theo Plockyn

Merge branch 'develop' into 'master'

Resynchro develop/master 🥳

Closes canopsis#1855 and #90

See merge request !238