Merge remote-tracking branch 'upstream/master' into sortable_multi_scope

Conflicts:
	behaviors/sortable.markdown