Merge branch 'hotfix/1.0.11'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 20:57:53 +0000 (16:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 20:57:53 +0000 (16:57 -0400)

Trivial merge