Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 23 May 2018 18:07:17 +0000 (14:07 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 23 May 2018 18:07:17 +0000 (14:07 -0400)

Trivial merge