Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Wed, 12 Sep 2018 15:40:09 +0000 (00:40 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Wed, 12 Sep 2018 15:40:09 +0000 (00:40 +0900)

Trivial merge