Merge branch 'jeffbolznv-scalar_block_layout'
authorJohn Kessenich <cepheus@frii.com>
Fri, 16 Nov 2018 16:57:59 +0000 (09:57 -0700)
committerJohn Kessenich <cepheus@frii.com>
Fri, 16 Nov 2018 16:57:59 +0000 (09:57 -0700)

Trivial merge