yeah, I guess docfrags are cool
Merge branch 'master' into gh-pages