V1.3 merged

For release.