Fix merge error
Merge branch 'master' of github.com:UV-CDAT/uvcdat-devel into devel-master