Merging motion-xray into master.