Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 10 Apr 2018 13:14:02 +0000 (09:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 10 Apr 2018 13:14:02 +0000 (09:14 -0400)

Trivial merge