Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:36:51 +0000 (16:36 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:36:51 +0000 (16:36 -0500)

Trivial merge