Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Mon, 16 Jul 2018 15:42:25 +0000 (00:42 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Mon, 16 Jul 2018 15:42:25 +0000 (00:42 +0900)

Trivial merge