Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Mon, 20 Aug 2018 09:26:19 +0000 (18:26 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Mon, 20 Aug 2018 09:26:19 +0000 (18:26 +0900)

Trivial merge