Merge branch '1540_tab_expansion_of_tilde'