Theodul pass player

Martin's merged commits.