Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Tue, 5 Jun 2018 08:54:58 +0000 (17:54 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Tue, 5 Jun 2018 08:54:58 +0000 (17:54 +0900)

Trivial merge