Please remove the trailing whitespace and we'll merge this!