Merge branch 'release/1.5.25' v1.5.25
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Dec 2018 15:01:55 +0000 (10:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Dec 2018 15:01:55 +0000 (10:01 -0500)

Trivial merge