1.7.0-dev
Merge pull request #977 from bblay/v1.7.0-dev

1.7.0-dev