Merge branch 'stable-2.13'

* stable-2.13:
  Make SimpleDateFormat thread safe

Change-Id: I5c25e247cad9577159134fc790063801d423106a