Merge "Merge branch 'master' into tizen_2.1" into tizen_2.1