Merge tag 'upstream/2.0.5.2'
authorBoyuan Yang <073plan@gmail.com>
Tue, 28 Nov 2017 12:11:25 +0000 (20:11 +0800)
committerBoyuan Yang <073plan@gmail.com>
Tue, 28 Nov 2017 12:11:25 +0000 (20:11 +0800)

Trivial merge