Merge branch 'master' into firrtl+modules+shiftfixes
authorJim Lawson <ucbjrl@berkeley.edu>
Mon, 27 Aug 2018 19:13:04 +0000 (12:13 -0700)
committerJim Lawson <ucbjrl@berkeley.edu>
Mon, 27 Aug 2018 19:13:04 +0000 (12:13 -0700)

Trivial merge