Merge pull request #530 from mhaskel/2.1.0-prep