Merge branch 'develop'
authorDonghoon Shin <dhs.shine@gmail.com>
Wed, 21 Sep 2016 06:02:02 +0000 (15:02 +0900)
committerDonghoon Shin <dhs.shine@gmail.com>
Wed, 21 Sep 2016 06:02:02 +0000 (15:02 +0900)

Trivial merge