Merge remote-tracking branch 'XTUPLE/master' into 4_6_x