Merge tag 'v1.0.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 13:52:09 +0000 (09:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 13:52:09 +0000 (09:52 -0400)
Version 1.0.26


Trivial merge