fixes #606
Merge branch 'master' of github.com:concerto/concerto