Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Mar 2018 19:09:36 +0000 (15:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Mar 2018 19:09:36 +0000 (15:09 -0400)

Trivial merge