Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Aug 2014 13:31:08 +0000 (09:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Aug 2014 13:31:08 +0000 (09:31 -0400)

Trivial merge