Merge branch '1.13.x' into master for 1.13.1 maintenance release

Change-Id: I7d9da9d06390e3d37ba87e2c78ed4856a62996d1