Merge "Shorten long lines in Linker.php to make phpcs pass"