Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Jan 2018 13:28:00 +0000 (08:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Jan 2018 13:28:00 +0000 (08:28 -0500)

Trivial merge