* upstream/master:
  bump x.y.z version to odd y after creation of RELEASE_3_10 branch
  bump x.y.z version to even y prior to creation of RELEASE_3_10 branch
  Fix NEWS file format