trailing whitespace cleanup
merging master