upstream/1.7+20120605

Doug Torrance

@dtorrance

29814d11 · Import Upstream version 1.7+20120605 · Aug 27, 2017

Upstream version 1.7+20120605