Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Feb 2018 16:49:31 +0000 (11:49 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Feb 2018 16:49:31 +0000 (11:49 -0500)

Trivial merge