Merge branch 'hotfix/1.5.28' v1.5.28
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Jan 2019 19:44:34 +0000 (14:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Jan 2019 19:44:34 +0000 (14:44 -0500)

Trivial merge