Merge branch 'hotfix/1.6.46' v1.6.46
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Jun 2017 16:01:18 +0000 (12:01 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Jun 2017 16:01:18 +0000 (12:01 -0400)

Trivial merge