Merge branch 'hotfix/1.2.21' v1.2.21
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Nov 2018 13:09:51 +0000 (08:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Nov 2018 13:09:51 +0000 (08:09 -0500)

Trivial merge