Fix #340.
Merge remote-tracking branch 'upstream/master'
Fix #346.
Merge remote-tracking branch 'upstream/master'