Commit 3fe62478 authored by canterburym's avatar canterburym

Merge branch 'r16/meeting/SA87e' into 'rel16'

Changes agreed at SA87e

See merge request !15
parents a73dbb8b 4577c052
Pipeline #3486 passed with stage
in 16 seconds