sync v2013.04-rc3 -> v2013.04-rc2 patch changes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>