Apply Mondrian Pull Request #207.