Merge branch 'master' into tizen_3.0
authorHermet Park <hermet@hermet.pe.kr>
Wed, 30 Nov 2016 13:10:03 +0000 (22:10 +0900)
committerHermet Park <hermet@hermet.pe.kr>
Wed, 30 Nov 2016 13:10:03 +0000 (22:10 +0900)

Trivial merge