Merge modcpp upstream