Merge "Give skin more control of OutputPage modules"