Add option to jump forward if lagging behind room controller (default on)
Merge remote-tracking branch 'origin/master'