'git am'able fix attached.
Created attachment 879630 [details] Don't ship patch backup files
Right, a Python file slipped. Thanks for spotting that! I applied the patch through all branches, but I think we won't need a build.