Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Fri, 25 May 2018 08:09:28 +0000 (17:09 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Fri, 25 May 2018 08:09:28 +0000 (17:09 +0900)

Trivial merge