Merge pull request #299 from mhaskel/1.5.0-prep