Merge branch 'master' into tizen accepted/tizen/common/20161007.173313 submit/tizen/20161007.094552
authorWoochan Lee <wc0917.lee@samsung.com>
Fri, 7 Oct 2016 09:45:05 +0000 (18:45 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Fri, 7 Oct 2016 09:45:05 +0000 (18:45 +0900)

Trivial merge