Merge branch 'pcmdi_master'

@doutriaux1 bringing my PCMDI/master up to date with my master