Update version number to 2.2.6
Merge branch 'master' into 2.3
Update version number to 2.3.0