Merge doc patches to master

@brutski Please merge.