Merge branch 'hgm/xboard/options'