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