Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #918 from Arantor/release-2.1

Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 i...