Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 1 Jun 2018 16:38:06 +0000 (12:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 1 Jun 2018 16:38:06 +0000 (12:38 -0400)

Trivial merge