Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Mon, 26 Nov 2018 15:07:29 +0000 (15:07 +0000)
committerTizenAPI-Bot <tizenapi@samsung.com>
Mon, 26 Nov 2018 15:07:29 +0000 (15:07 +0000)

Trivial merge