Oops :P
Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #1105 from Antes/version

Oops :P
Merge pull request #1106 from Arantor/release-2.1

Very minor things