DifficultyCategory.from_string() - Accept older categories also
Merge branch 'master' into popover-style