Merge branch 'hotfix/1.0.25'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 1 Nov 2016 18:56:15 +0000 (14:56 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 1 Nov 2016 18:56:15 +0000 (14:56 -0400)

Trivial merge