Merge branch 'hotfix/1.2.19' v1.2.19
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Jun 2018 14:30:14 +0000 (10:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Jun 2018 14:30:14 +0000 (10:30 -0400)

Trivial merge