Merge remote-tracking branch 'XTUPLE/master' into tags/R3_3_7