Merge "Setup.php: Move hacky skin requires higher up"