Merge branch 'master' of https://github.com/nomacs/nomacs
Merge branch 'master' of https://github.com/nomacs/nomacs