Merge branch 'release/1.6.25' v1.6.25
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:09:00 +0000 (14:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:09:00 +0000 (14:09 -0400)

Trivial merge