Merge tag '2.0.5'
authorBoyuan Yang <073plan@gmail.com>
Tue, 7 Nov 2017 12:02:44 +0000 (20:02 +0800)
committerBoyuan Yang <073plan@gmail.com>
Tue, 7 Nov 2017 12:02:44 +0000 (20:02 +0800)
Release 2.0.5


Trivial merge