merge fix for blank lines from trunk