Checking in changes prior to tagging of version 2.2.0.