vcsh: upstream version 1.20130724