Merge branch 'hotfix/1.5.31' v1.5.31
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Feb 2019 18:29:59 +0000 (13:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Feb 2019 18:29:59 +0000 (13:29 -0500)

Trivial merge