Commit 379b559d authored by Jason Plum's avatar Jason Plum

Merge branch 'smart.bit/gitlab-patch-1' to 'master'

Closes !945

local reconcole of conflicts, and merge.

Thanks @smart.bit !
parents 917382fb 6a2fbc9c
Pipeline #87684803 passed with stages
in 90 minutes and 45 seconds