Fixes #612
Merge branch 'next' of https://github.com/WebTales/rubedo into next