Merge pull request #3270 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 30 Oct 2015 02:24:48 +0000 (10:24 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 30 Oct 2015 02:24:48 +0000 (10:24 +0800)
Update as upstream


Trivial merge