Patched patches
Merge pull request #769 from elken/master

Patched patches