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

Trivial merge