[deadbeef/f27] (4 commits) ...Update patches to use upstream code.