SimpleMachines/SMF2.1 — pull request #1492 by Oldiesmann (2014-03-29 17:02:55+00:00)
Title: ! Previous fix for #1221 was horribly incomplete (fixes #1475 and #1484)

Signed-off-by: Michael Eshom