Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Fri, 24 Aug 2018 15:39:51 +0000 (00:39 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Fri, 24 Aug 2018 15:39:51 +0000 (00:39 +0900)

Trivial merge