Fix up release task
Merge branch '1.13' into 1.14