Merge commit 'bc7eea5' into tizen