merge from trunk
tree5e18694b582e7e9e9c7446134aee5e65d698661f
drwxr-xr-x - lib