Heads-up: one change merged for -rc6 that might be good to have in the next 6.1.y release