Merge branch 'hotfix/1.6.45' v1.6.45
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Jun 2017 19:13:39 +0000 (15:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Jun 2017 19:13:39 +0000 (15:13 -0400)

Trivial merge