Merging 2 fixes from base repo on github. Editor choose to play with tabs of empty lines everywhere