Updated Aliases
Merge pull request #1264 from bumbadadabum/master

Updated Aliases
Trivia plugin: revert rebase, keep working updates