Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Fix Postgresql JDBC driver leaking memory

Change-Id: I41b069476714315771a39e623b7cebc2e135d6c2