Merge branch 'hotfix/1.6.44' v1.6.44
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Jun 2017 16:47:29 +0000 (12:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Jun 2017 16:47:29 +0000 (12:47 -0400)

Trivial merge