Merge branch 'hotfix/1.0.20' v1.0.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 15:58:49 +0000 (10:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 15:58:49 +0000 (10:58 -0500)

Trivial merge