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

Trivial merge