Merge branch 'master' into tizen accepted/tizen/common/20160928.164036 submit/tizen/20160928.045111
authorWoochan Lee <wc0917.lee@samsung.com>
Wed, 28 Sep 2016 04:48:38 +0000 (13:48 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Wed, 28 Sep 2016 04:48:38 +0000 (13:48 +0900)

Trivial merge