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

...nto release-2.1

Signed-off-by: Peter Spicer <sleeping@myperch.org>