Conditional tag added.
Merge pull request #741 from Gravecorp/3.1.x.x

Conditional tag added.