Fix unicode strip functions
Merge commit '6ca998f'