Comment 18 for bug 1739593

I wanted to give the master change sometime to bed in and while there are conflicts there don't appear to be any show stoppers AFAICT. I'll try to post something for review in the coming week so other stable cores can review.