Merge branch 'master' into cgldr
Merge branch 'cgldr' of github.com:cwingard/marine-integrations into cgldr