Merge branch 'release/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Aug 2016 16:46:06 +0000 (12:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Aug 2016 16:46:06 +0000 (12:46 -0400)

Trivial merge