Merge upstream modcpp & switch to locally hosted files