Its late so sue me.
Merge pull request #728 from Gravecorp/3.1.x.x

Its late so sue me.