Merge "Changed TAB indents to spaces+traaling white space"