Disabled rollthedice again. Don't re-enable
Merge remote-tracking branch 'origin/master'