Bugfix for cyclic include with Ruby RBX
Merge branch 'rbx-fix'