Code

Merge branch 'jn/rpm-spec' into maint