Merge remote-tracking branch 'upstream/master'

* upstream/master:
  bump x.y.z versions to odd y after creation of RELEASE_3_7 branch
  bump x.y.z versions to even y prior to creation of RELEASE_3_7 branch