3.5.8 [BE.6] RC1
Merge remote-tracking branch 'origin/Bleeding-edge' into Bleeding-edge

Conflicts:
	jquery.nicescroll.js
3.5.8 [BE.6] RC1