Merge Develop into Master for 1.3