Merge branch 'release/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:40:33 +0000 (15:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:40:33 +0000 (15:40 -0400)

Trivial merge