Merge pull request #2730 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Tue, 8 Sep 2015 05:24:42 +0000 (13:24 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 8 Sep 2015 05:24:42 +0000 (13:24 +0800)
Update as upstream


Trivial merge