Merge pull request #286 from apenney/fix-for-post-wheezy