1.3 to master

Merging 1.3.1 changes to master