use 'O' rather than '0' for fold/unfold all keyboard shortcuts
change restart R shortcut to Cmd+Shift+F10
Merge remote-tracking branch: upstream/master