Merge pull request #5359 from jefferyto/slide-switch-0.9.1