Merge branch 'release/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Oct 2015 19:28:09 +0000 (15:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Oct 2015 19:28:09 +0000 (15:28 -0400)

Trivial merge