Merge branch 'hotfix/1.0.10' v1.0.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 12:48:44 +0000 (08:48 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 12:48:44 +0000 (08:48 -0400)

Trivial merge