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

Trivial merge