Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Apr 2018 14:10:09 +0000 (10:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Apr 2018 14:10:09 +0000 (10:10 -0400)

Trivial merge