Merge tag 'v1.5.25' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:48 +0000 (06:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:48 +0000 (06:30 -0400)
Version 1.5.25


Trivial merge