Merge "fix the build... sorry... bad docs..." into honeycomb