Merge pull request #917 from Arantor/release-2.1

Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 i...
Merge pull request #918 from Arantor/release-2.1

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