merging mouse support from u-ra:master