Merge tag 'upstream/1.0.2m' into tizen_4.0_base