Commit a18b81d4 authored by dmorley's avatar dmorley
Browse files

Merge branch 'develop' into 'master'

2.6.0 release merge

See merge request !236
parents 431043d0 87b18790
Pipeline #1457 passed with stage
in 2 minutes and 45 seconds