Merge pull request #3398 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Wed, 11 Nov 2015 02:06:47 +0000 (10:06 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 11 Nov 2015 02:06:47 +0000 (10:06 +0800)
Update as upstream


Trivial merge