Merge branch 'hotfix/1.0.27' v1.0.27
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 16:56:51 +0000 (12:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 16:56:51 +0000 (12:56 -0400)

Trivial merge