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

Trivial merge