from gitX2
merged with origin