updated to 3.18-rc6