Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Mon, 14 May 2018 01:43:20 +0000 (10:43 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Mon, 14 May 2018 01:43:20 +0000 (10:43 +0900)

Trivial merge