Commit 22064176 authored by Erick Hitter's avatar Erick Hitter

Merge branch 'develop' into 'master'

Consistency

See merge request !2
parents cef14b11 c5a746cb
Pipeline #2304 passed with stage
in 13 seconds