Merge branch 'master' into v0.5.10-branch
Merge branch 'v0.5.10-branch' of https://github.com/campreilly/UnderSeaModelingLibrary.git into v0.5.10-branch