Merge branch 'hotfix/1.1.39' v1.1.39
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Feb 2018 17:43:35 +0000 (12:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Feb 2018 17:43:35 +0000 (12:43 -0500)

Trivial merge