Merge pull request #1 from ESGF/devel

1.7.0-phoenix-release-master
Merge pull request #2 from ESGF/devel

1.7.1