Merged into 1.34 layout.php