Merge "We are now Honeycomb." into honeycomb