Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Nov 2018 14:52:35 +0000 (09:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Nov 2018 14:52:35 +0000 (09:52 -0500)

Trivial merge