am ec45ea65: am 37e8ce55: Merge "Lose the version number from the directory name."

* commit 'ec45ea65458b1a0a3bee0a188c5b713ea0d2d093':
  Lose the version number from the directory name.