Merge from lexical-binding branch.