Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 16:25:08 +0000 (11:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 16:25:08 +0000 (11:25 -0500)

Trivial merge