Beat: Fixes crash when relative option enabled.  Closes #1538
Merge branch '3.0'