Updates for 1.8.5-rc1