am 52c97844: Merge change 5640 into donut

Merge commit '52c978444074e4425de3434b06c12d560ff59419'

* commit '52c978444074e4425de3434b06c12d560ff59419':
  Bump release version number and speed up make-release.sh script