Merging 1.9 into 1.x