Bump version for 3.1.1 (final)

(cherry picked from commit 816556d8e48b7bf74d479e189ae3f30a757e5c58)