Merged 1.3.0 release