Merge "Remove empty lines from PHP and JavaScript comment blocks"