More documentation.
Merge branch 'master' into knitic