Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Nov 2018 13:02:14 +0000 (08:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Nov 2018 13:02:14 +0000 (08:02 -0500)

Trivial merge