Merge Develop into Master for 1.3.1 release

v1.3.1 release