Merge branch 'hotfix/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 19:57:06 +0000 (15:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 19:57:06 +0000 (15:57 -0400)

Trivial merge