Merge branch 'hotfix/1.2.29' v1.2.29
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 12:25:02 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 12:25:02 +0000 (08:25 -0400)

Trivial merge