Merge remote-tracking branch 'XTUPLE/4_6_X' into haxtuple-rest