Sync commit
Merge branch 'master' of git@github.com:bartvbl/OpenRR.git