Merged in a doc fix from wcooley's
02ce27558acb563282ea5f894348ba11ad64a55e