Merge branch 'stable-3.13'

* stable-3.13:

Change-Id: I6d695149a9d1120bcfbc8755cbdc89f6c19f6620