Merge branch 'master' of git+ssh://git.asbjorn.biz/rapper