Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 27 Jun 2018 14:37:44 +0000 (10:37 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 27 Jun 2018 14:37:44 +0000 (10:37 -0400)

Trivial merge