Commit 25aa7016 authored by dmorley's avatar dmorley

Merge branch 'develop' into 'master'

[2.6.2] - 2019-11-24

See merge request !245
parents 9b7f6936 4eebe5e3
Pipeline #2939 passed with stage
in 47 seconds