SimpleMachines/SMF2.1 — pull request #320 by emanuele45 (2013-03-23 15:58:02+00:00)
Title: Cherry pick

A collection of cherry-picking from Spuds and eurich