Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Wed, 29 Aug 2018 05:34:49 +0000 (14:34 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Wed, 29 Aug 2018 05:34:49 +0000 (14:34 +0900)

Trivial merge