release 2.2.1
Merge pull request #6965 from trawor/fork

release 2.2.1