Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Fri, 4 Jan 2019 02:31:40 +0000 (02:31 +0000)
committerTizenAPI-Bot <tizenapi@samsung.com>
Fri, 4 Jan 2019 02:31:40 +0000 (02:31 +0000)

Trivial merge