Merge remote-tracking branch 'upstream/stable/folsom' into folsom-2012.2...

....4