Merge branch 'duplex' of nerv.dolda.net:src/ashd into duplex