osmo-trx.git branch fairwaves/master updated. 00cc772f90b274bb75232f29b20c31d5b552cfde