Merge pull request #592 from HelenCampbell/2.2.2