Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Wed, 12 Dec 2018 00:30:45 +0000 (00:30 +0000)
committerTizenAPI-Bot <tizenapi@samsung.com>
Wed, 12 Dec 2018 00:30:45 +0000 (00:30 +0000)

Trivial merge