Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 13:26:03 +0000 (09:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 13:26:03 +0000 (09:26 -0400)

Trivial merge