Merge branch 'master' into tizen_3.0
authorHermet Park <hermet@hermet.pe.kr>
Tue, 29 Nov 2016 12:28:15 +0000 (21:28 +0900)
committerHermet Park <hermet@hermet.pe.kr>
Tue, 29 Nov 2016 12:28:15 +0000 (21:28 +0900)

Trivial merge