Merge "Move white-space: nowrap from PHP to CSS"