Merge branch 'develop'
authorDonghoon Shin <dhs.shine@gmail.com>
Fri, 7 Oct 2016 03:56:57 +0000 (12:56 +0900)
committerDonghoon Shin <dhs.shine@gmail.com>
Fri, 7 Oct 2016 03:56:57 +0000 (12:56 +0900)

Trivial merge