Merge remote-tracking branch 'origin/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Fri, 27 Apr 2018 01:28:36 +0000 (10:28 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Fri, 27 Apr 2018 01:28:36 +0000 (10:28 +0900)

Trivial merge