Fixed Sliders. Again.
Merge origin/master