r3977 Final preparation before 0.18.5 release