Push to pull Lars' changes
Merge branch 'master' of https://github.com/atticedit/concert
commit to enable merge with Lars' push
Fixes merge conflicts.