Bug 957731 - Made wrapper content OOP again
Merge pull request #15121 from benfrancis/957731

Bug 957731 - Made wrapper content OOP again r=alive