Merge branch 'release/1.0.0x' master v1.0.0x
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Dec 2018 15:34:34 +0000 (10:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Dec 2018 15:34:34 +0000 (10:34 -0500)

Trivial merge