Merge folsom-p into folsom

Merging upstream 2012.2.3 into our folsom branch.