Merge branch '1.8' into 1.9.
Fixed typos in ml_elm_object_item_*.
Merge branch '1.8' into 1.9.
Removed other definition of String_opt_val.
Merge branch '1.9'.