Merge branch 'rpm'