Fix timezone problems.
Bump version v2.3.1.
Merge branch 'release/v2.3.1'