Merge branch 'release/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 13:10:03 +0000 (09:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 13:10:03 +0000 (09:10 -0400)

Trivial merge