Pull from 2.3.1 with its history
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 1 May 2015 07:13:22 +0000 (16:13 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 1 May 2015 07:13:22 +0000 (16:13 +0900)

Trivial merge