Merge "Fixed deletion of last character with no place-holder text" into devel/master