Merge from xtuple fork to master copy