release 2.2.0
Merge pull request #6774 from trawor/fork

release 2.2.0