ee8619d Merge pull request #2537 from pitr-ch/tdd/justified-rpm