Merge branch 'master' of moltke.seatribe.se:/usr/local/src/wrw