Merge branch 'release/1.0.5' master v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Dec 2018 14:46:05 +0000 (09:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Dec 2018 14:46:05 +0000 (09:46 -0500)

Trivial merge