Merge release v1.3.1

Ping @ewindisch @unclejack @crosbymichael @jfrazelle @LK4D4 @vieux 
Please make sure all 1.3.1 commits from the release branch are here, or on master.
Yes, I keep messing with the release merges (sorry), was trying to prevent a fix release, containing another thing that needs fixing :smile: