missing rpm
full upgrade
Merge remote-tracking branch 'upstream/master'