because i suck
Merge pull request #718 from Gravecorp/3.1.x.x

because i suck