fix folderization of strings
Merge branch 'master' into hvm