Merged v1.3.x-stage into v1.3.x
drwxr-xr-x - trunk