am 68c56a51: Merge "Documentation fix." into honeycomb

* commit '68c56a51b32b5f5322c4f0f7dbba918712ad6473':
  Documentation fix.