1.3.1 release
Merge remote-tracking branch 'original/master'