Merge branch 'master' into tizen_3.0 accepted/tizen/3.0/common/20161124.181614 accepted/tizen/3.0/mobile/20161124.081831 submit/tizen_3.0/20161123.082748
authorWoochan Lee <wc0917.lee@samsung.com>
Wed, 23 Nov 2016 08:26:17 +0000 (17:26 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Wed, 23 Nov 2016 08:26:17 +0000 (17:26 +0900)

Trivial merge