Cleaned up all extra white spaces at the end of lines
Merge commit 'ea7e7c72b04b12eb3741e871572871b0f1595910'