Fixed error
Merge branch 'master' into tizen2