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

Trivial merge