Release 1.3.0

Merge back changes to stable branch