Merge branch 'feature/r-r' into release/20130326