Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Set Gerrit to 3.1.13

Change-Id: If705dacd7eba3d86e3e8f913f7a2f10af9212c71