Fix regressions of ac0d8bf8bef2e5aa09106289a277ca39e5ee5cfe.
Merge branch '0.1.x' of https://github.com/substance/converter into 0.1.x