Release v2.3.1
Merge branch 'maint/2.3.x'