Merge branch 'f30'

This is to correct my silly mistake of cherry-picking the last 2 commits
from master onto f30 (instead of just fast-forward merging them).  After
this artificial merge commit, we can continue fast-forwarding anything
that needs backporting to f30.
epel9
Michal Domonkos 6 years ago
commit f2be5f62fc

Diff Content Not Available