Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Wed, 9 Jan 2019 00:07:28 +0000 (00:07 +0000)
committerTizenAPI-Bot <tizenapi@samsung.com>
Wed, 9 Jan 2019 00:07:28 +0000 (00:07 +0000)

Trivial merge