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