More Documentation.
Merge branch 'master' into stripped-down