Merge pull request #573 from HelenCampbell/release2.2.1