Merge patches from John Hughes
5 files changed