Update for 1.9.5 r6