1.7.0 prep
Merge pull request #378 from mhaskel/1.7.0-prep

1.7.0 prep