Merge branch 'master' into folder_modification
authorkang <pilseob.kang@samsung.com>
Thu, 31 Aug 2017 06:15:51 +0000 (15:15 +0900)
committerkang <pilseob.kang@samsung.com>
Thu, 31 Aug 2017 06:15:51 +0000 (15:15 +0900)

Trivial merge