meh
Merge branch 'jearles' of https://github.com/vattercw/SentinelsOfTheMultiverse into jearles