Merge pull request #4291 from yamatoya/master
authorCheng Zhao <zcbenz@gmail.com>
Mon, 1 Feb 2016 05:11:01 +0000 (13:11 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 1 Feb 2016 05:11:01 +0000 (13:11 +0800)
:memo: Update as upstream


Trivial merge