Imported latest upstream ``octrees'' changes.