Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Apr 2017 18:07:20 +0000 (14:07 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Apr 2017 18:07:20 +0000 (14:07 -0400)

Trivial merge