Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 5 Feb 2018 20:33:15 +0000 (15:33 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 5 Feb 2018 20:33:15 +0000 (15:33 -0500)

Trivial merge