Merge pull request #2755 from dehotot/debug-option-rpms