Merge branch '1.13.x' into master for emergency fix for 1.13.0 release

Change-Id: I4e58d37535230ab079d36da0152fc152d9ab31ea