am cdef4045: (-s ours) Merge 5d66a07d - do not merge

* commit 'cdef404572a71ea320f59643c52143764bd590fe':
  Use actual numbers in version numbers.