Merge branch 'hotfix/1.5.29' v1.5.29
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Jan 2019 19:05:03 +0000 (14:05 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Jan 2019 19:05:03 +0000 (14:05 -0500)

Trivial merge