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

Trivial merge