merged rolands commit
merged rolands commit

metabit/bitsquare,metabit/bitsquare,bitsquare/bitsquare,ManfredKarrer/exchange,bisq-network/exchange,sakazz/exchange,sakazz/exchange,bisq-network/exchange,haiqu/bitsquare,ManfredKarrer/exchange,myteer/bitsquare,haiqu/bitsquare,myteer/bitsquare,bitsquare/bitsquare