Merge pull request #951 from tokkee/sh/debian-patches