Merge branch 'master' of https://git.lemmasoftware.org/Merlin into master