Merge branch 'hotfix/1.0.10' v1.0.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 15 Feb 2017 16:47:18 +0000 (11:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 15 Feb 2017 16:47:18 +0000 (11:47 -0500)

Trivial merge