merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:43:40 +0000 (15:43 -0700)]

Trivial merge