1.3.1 to master

Merging 1.3.1 to master