Merge branch 'hotfix/1.6.48' v1.6.48
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 15:25:56 +0000 (11:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 15:25:56 +0000 (11:25 -0400)

Trivial merge