Merge "Added protocol option to Linker and OutputPage::addReturnTo."