Merge pull request #566 from bmjen/2.2.0-prep