Merge branch 'master' into refactor-all

Conflicts:
	slider.js