release 2.1.2
Merge pull request #6332 from trawor/fork

release 2.1.2