changed milestone to %3.6.x
enabled an automatic merge when all merge checks for 209214f8 pass
merged