Merge branch 'master' of git@wendt.se:hermes