Merge branch 'hotfix/1.0.70' v1.0.70
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Nov 2018 21:25:21 +0000 (16:25 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Nov 2018 21:25:21 +0000 (16:25 -0500)

Trivial merge