Merge "Remove empty lines at end of functions"