Merge branch 'devel'

* devel:
  bump x.y.z versions to odd y after creation of 3_5 branch
  bump x.y.z versions to even y prior to creation of 3_5 branch
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel
  Merge branch 'master' into devel