Second v1.3.4-dev merge.
drwxr-xr-x - trunk