HOTFIX: label=all->label=None
Merge remote-tracking branch 'upstream/master'