Merge commit 'upstream/6.x+1.3'
drwxr-xr-x - rootcandy