removed changes made to white spaces
Merge remote-tracking branch 'upstream/master'

Merge with upstream master