Merge pull request #468 from mhaskel/1.8.0-prep