Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Aug 2018 12:25:33 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Aug 2018 12:25:33 +0000 (08:25 -0400)

Trivial merge