Merge "Upgrade version number" into honolulu