formating
Do not alter the allocated string.
rephrase
Merge branch 'master' into portable