Merge pull request #7637 from AndersHoglund/spektrum_tm_fix_rpm