Merge "Fix java.util.Scanner bugs." into klp-dev