Oops - Mouse ClassDriver multi-arch demo changes were applied to trunk, rather than the correct branch.