Merge branch 'issue53_durack1_TAS_units_hardcode'
Merge branch 'pcmdi_master'
Merge branch 'pcmdi_master'
Merge branch 'pcmdi_master'
Merge pull request #101 from durack1/master

durack1 bringing PCMDI up-to-date with durack1/master