Merge "Fix bug in Value.getBaseline()."