Merge branch 'hotfix/1.0.10' v1.0.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 4 Oct 2017 19:59:34 +0000 (15:59 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 4 Oct 2017 19:59:34 +0000 (15:59 -0400)

Trivial merge