Merge branch 'master' into gui
drwxr-xr-x - trunk