Merge pull request #550 from mhaskel/2.1.1-prep