Commit f792937e authored by canterburym's avatar canterburym

Merge branch 'sa3#88' into 'rel16'

Changes agreed at SA88e

See merge request !21
parents 3fe62478 aaa774c6
Pipeline #4586 passed with stage
in 15 seconds