Merge branch 'master' of moltke.seatribe.se:src/ashd