Merge pull request SimpleMachines#2869 from FearThe1337/Fixes007

Fix SimpleMachines#2765 - Post merging resulting in wrong stats

Tagging 2.1 Beta 1