Merge pull request #3409 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Thu, 12 Nov 2015 04:49:51 +0000 (12:49 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Thu, 12 Nov 2015 04:49:51 +0000 (12:49 +0800)
Update as upstream


Trivial merge