Make the backspace behave normally
Merge branch 'backspace' into staging