Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Fix Postgresql JDBC driver leaking memory

Change-Id: I4e35aaa2908788c8fbe22eaf07aba9355b52f67b