Merge pull request #3819 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Tue, 15 Dec 2015 14:40:09 +0000 (22:40 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 15 Dec 2015 14:40:09 +0000 (22:40 +0800)
Update as upstream


Trivial merge