Minor fixes for 2.3.1 version.
Merge branch 'master' into release
Release.