Merge branch 'master' into tizen accepted/tizen/mobile/20160107.100328 accepted/tizen/tv/20160107.100401 accepted/tizen/wearable/20160107.100448 submit/tizen/20160106.023123
authorjoon.c.baek <joon.c.baek@samsung.com>
Wed, 6 Jan 2016 02:30:02 +0000 (11:30 +0900)
committerjoon.c.baek <joon.c.baek@samsung.com>
Wed, 6 Jan 2016 02:30:02 +0000 (11:30 +0900)

Trivial merge