Summary of changes:
5ab8e7f... Work around a new GCC warning (*)
012c462... Actually add the patch (*)
ab95437... One more unused typedef (*)
969da59... Merge branch 'master' into f17
(*) This commit already existed in another branch; no separate mail sent