Merge branch 'hotfix/1.5.23' v1.5.23
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Oct 2018 19:20:53 +0000 (15:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Oct 2018 19:20:53 +0000 (15:20 -0400)

Trivial merge