Merge branch 'master' of https://github.com/regniblod/kelda.git