3b95513 overrides: merge upstream changes

Authored and Committed by decathorpe 5 years ago
    overrides: merge upstream changes