Issue #467
Merge from master
Merge pull request #506 from aodn/worlds_most_trivial_branch

 Issue #467