Merge branch 'hotfix/1.5.25' v1.5.25
authorSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:06 +0000 (06:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:06 +0000 (06:30 -0400)

Trivial merge