Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Set Gerrit to 3.1.13

Change-Id: I5cd82c1e204d37b415c3da1f29e9f5642d4d7576