Fixes #427.
Merge branch 'master' of github.com:symbiose/symbiose