Move to cms-sw/root#3aa50dc