Merged all relevant deltas from Google Code l1j-en.