Merge branch 'master' into fixup
authorKeith Packard <keithp@keithp.com>
Fri, 13 Nov 2015 00:31:19 +0000 (16:31 -0800)
committerKeith Packard <keithp@keithp.com>
Fri, 13 Nov 2015 00:31:19 +0000 (16:31 -0800)

Trivial merge