Commit c1f36bc4 authored by Patrik Dufresne's avatar Patrik Dufresne

Merge branch 'develop' into 'master'

Develop

See merge request !11
parents 27e88cc7 58bc847a
Pipeline #481 passed with stages
in 3 minutes and 58 seconds