Tweaks.
Fix #287.
Merge remote-tracking branch 'upstream/master'
Fix #286.
Fix #289.
Fix #291.
Merge remote-tracking branch 'upstream/master'