Initial merge of 1.3.0 code in preparation for 1.3.0 release