Merge 'master' branch into tizen_2.1