Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 13:51:58 +0000 (09:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 13:51:58 +0000 (09:51 -0400)

Trivial merge