Release 0.21.1
Merge remote-tracking branch 'upstream/master'