Merge from xtuple master