Updating for 1.3 release
Merge branch 'release/1.3-alpha' into develop