Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 Oct 2017 17:50:34 +0000 (13:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 Oct 2017 17:50:34 +0000 (13:50 -0400)

Trivial merge