Merge pull request #3729 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Wed, 9 Dec 2015 04:15:40 +0000 (12:15 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 9 Dec 2015 04:15:40 +0000 (12:15 +0800)
Update as upstream


Trivial merge