Merge pull request #1119 from jaypoulz/master

I'm dead