Merge branch 'master' into tizen accepted/tizen/3.0/common/20161114.110340 accepted/tizen/common/20161013.155926 submit/tizen/20161013.034343 submit/tizen_3.0_common/20161104.104000
authorWoochan Lee <wc0917.lee@samsung.com>
Thu, 13 Oct 2016 03:42:51 +0000 (12:42 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Thu, 13 Oct 2016 03:42:51 +0000 (12:42 +0900)

Trivial merge