Note: It's unclear which of these patches have in fact already been applied. We should figure that out ...
