Merge "Merging master changes to tizen_2.1 branch" into tizen_2.1