Merge "Fix for pre-edit text." into devel/master