On the fly document conversion fun.
Merge branch 'entspannt' of https://github.com/substance/substance into entspannt