Merge pull request #6 from ESGF/devel

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

1.7.1