Merge pull request #3192 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Sat, 24 Oct 2015 07:46:59 +0000 (15:46 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Sat, 24 Oct 2015 07:46:59 +0000 (15:46 +0800)
Update as upstream


Trivial merge