Upstream pull.

lunar-tools: version 2013.4