Merge remote-tracking branch 'upstream/v2.4' into v2.4
Merge branch 'v2.4' of github.com:CraZySacX/mongo into v2.4