Fix R history loading
Merge branch 'r'