Merge remote-tracking branch 'origin/master'
authorMegan Wachs <megan@sifive.com>
Mon, 8 Aug 2016 18:41:25 +0000 (11:41 -0700)
committerMegan Wachs <megan@sifive.com>
Mon, 8 Aug 2016 18:41:25 +0000 (11:41 -0700)

Trivial merge