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

Trivial merge