pytorch

a7382d52 - Merge remote-tracking branch 'upstream/master' into upstream_merge_april