Merge branch 'hgm/xboard/usermove'