Merge pull request #3688 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 4 Dec 2015 10:46:33 +0000 (18:46 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 4 Dec 2015 10:46:33 +0000 (18:46 +0800)
Update as upstream


Trivial merge