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

Trivial merge