Allow underscores in bottle versions as well