Merge branch 'bugfix-213' into new-moon