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

Change-Id: I203014c86c40490e99c002f811112403224d63f1