Merge branch 'hotfix/1.0.9'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 12:42:58 +0000 (08:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 12:42:58 +0000 (08:42 -0400)

Trivial merge