dkogan Merge remote-tracking branch 'origin/master' into richer-board-shape