Merge branch 'hotfix/1.0.10' v1.0.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 26 May 2017 17:55:44 +0000 (13:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 26 May 2017 17:55:44 +0000 (13:55 -0400)

Trivial merge