Commit 6fe36e44 authored by Jessé Vermeulen's avatar Jessé Vermeulen

Merge branch 'develop' into 'master'

Develop

Closes #1

See merge request !5
parents 3da47bf3 cb773353
Pipeline #1472 passed with stage
in 14 seconds