Updating docs.
Merge branch 'cf10'