v2014.07: sync

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