Upgrade RMR to 3.6.1