Merge branch 'hotfix/1.7.13' v1.7.13
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Jan 2019 20:47:43 +0000 (15:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Jan 2019 20:47:43 +0000 (15:47 -0500)

Trivial merge