release 2.3.0
Merge pull request #7740 from trawor/fork

release 2.3.0