Merge remote-tracking branch 'origin/tizen' into tizen_3.0