Merge remote branch 'origin/master' into gui
drwxr-xr-x - doc
drwxr-xr-x - trunk