Fix #354.
Fix #247.
Fix #352.
Slider tweak.
Merge remote-tracking branch 'upstream/master'