merge to v2013.01

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