Merge pull request #3618 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Mon, 30 Nov 2015 07:01:08 +0000 (15:01 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 30 Nov 2015 07:01:08 +0000 (15:01 +0800)
Update as upstream


Trivial merge