Cherrypicking c31d921 onto 117edbb Conflicts: release/scripts/startup/bl_ui/properties_game.py
117edbb