osmo-trx.git branch fairwaves/master updated. a6e2d6f9a109662ff4e95bff1d49dfa00c4b164c