Partial fix for #462
Merge branch 'v0.10' of github.com:mde/geddy into v0.10