release 2.1.1
Merge pull request #6125 from trawor/fork

release 2.1.1