Bump to 1.3.1. Update changelog.
Merge from master.
Merge from master.