manual merge of Paulette's doc branch