Merge branch 'release/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Sep 2017 19:25:11 +0000 (15:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Sep 2017 19:25:11 +0000 (15:25 -0400)

Trivial merge