merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:43:18 +0000 (17:43 -0700)]

Trivial merge