! Minor upgrade tweaks

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 #2478 from Oldiesmann/release-2.1

! Minor upgrade tweaks