Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Tue, 8 Jan 2019 02:09:11 +0000 (02:09 +0000)
committerTizenAPI-Bot <tizenapi@samsung.com>
Tue, 8 Jan 2019 02:09:11 +0000 (02:09 +0000)

Trivial merge