bump RPM packaging version
Merge remote branch 'upstream/master'