Patch By: Ceres Reviewed By: marder Comments By: Stan Differential Revision: D4252 This was SVN commit r25925.