Merge branch 'hotfix/1.5.29' master v1.5.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 15:03:29 +0000 (10:03 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 15:03:29 +0000 (10:03 -0500)

Trivial merge