fix xmms2d substituting whitespaces with '+' in paths
Merge branch 'test'