Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Thu, 23 Feb 2017 06:58:32 +0000 (22:58 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 23 Feb 2017 06:58:32 +0000 (22:58 -0800)
Discard change to hide refdes


Trivial merge