Merge pull request #741 from Gravecorp/3.1.x.x

Conditional tag added.
bitch bitch bitch
Merge branch '3.1.x.x' of github.com:kellyelton/OCTGN into 3.1.x.x-proxygen