xopxe Merge branch 'master' of git://github.com/mrichart/Rnr into mrichart-…