Merge branch 'hotfix/1.2.24' v1.2.24 v1.2.25
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:15:40 +0000 (08:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:15:40 +0000 (08:15 -0400)

Trivial merge