WIP: unrender error
fixes #941
Merge branch 'gh-941' into dev