Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Thu, 26 Jul 2018 10:41:51 +0000 (19:41 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Thu, 26 Jul 2018 10:41:51 +0000 (19:41 +0900)

Trivial merge