Refix #315.
Refix #315.
Merge remote-tracking branch 'upstream/master'