Merge branch '173-updating-controlled-vocabularies-fails' into 'master'

Resolve "Updating controlled vocabularies fails"

Closes #173

See merge request !167
5 jobs for master in 4 minutes and 39 seconds (queued for 2 seconds)
latest