Yay for redundancy...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1
Merge pull request #2314 from Oldiesmann/release-2.1

Yay for redundancy...