Merge remote-tracking branch 'origin/delegate'

Conflicts:
	src/dom/Draggable.js