Sync from Houdini trunk