Perforce 2013.1.659207

Closes #20757.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>