Merge upstream with modcpp