apply missing patches
Merge pull request #2 from mikeferguson/master

Apply missing patches