Merge commit '60e1df9' into tizen