Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Mar 2018 20:04:35 +0000 (15:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Mar 2018 20:04:35 +0000 (15:04 -0500)

Trivial merge