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.