Merge branch 'develop' of git://github.com/dankelley/oce into develop
Merge branch 'develop' of github.com:richardsc/oce into develop
Merge remote-tracking branch 'upstream/develop' into develop
update NAMESPACE with as.met