Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 14:21:17 +0000 (09:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 14:21:17 +0000 (09:21 -0500)

Trivial merge