Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Tue, 4 Sep 2018 10:08:09 +0000 (19:08 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Tue, 4 Sep 2018 10:08:09 +0000 (19:08 +0900)

Trivial merge