am f86626ca: am 12d71b66: Merge "resolve merge conflicts of 838c441 to master."

* commit 'f86626ca295e423425a0d2e3688795ebf87e18df':
  package-release.sh: script breaks if commit msg contains single quote(')
  package-release.sh: Merge master version.