Fix #2004 - Indent breaks when hitting enter before spaces
Merge pull request #2690 from AmnonOwed/Fix2004-IndentBreaksOnEnterBeforeSpaces

Fix #2004 - Indent breaks when hitting enter before spaces