Merge branch 'master' into dev

Sortable.js

@@ -830,31 +830,34 @@
 					}
 				}
 
-				// Nulling
+			}
-				rootEl =
+			this._nulling();
-				dragEl =
+		},
-				parentEl =
-				ghostEl =
-				nextEl =
-				cloneEl =
 
-				scrollEl =
+		_nulling: function() {
-				scrollParentEl =
+			// Nulling
+			rootEl =
+			dragEl =
+			parentEl =
+			ghostEl =
+			nextEl =
+			cloneEl =
 
-				tapEvt =
+			scrollEl =
-				touchEvt =
+			scrollParentEl =
 
-				moved =
+			tapEvt =
-				newIndex =
+			touchEvt =
 
-				lastEl =
+			moved =
-				lastCSS =
+			newIndex =
 
-				activeGroup =
+			lastEl =
-				Sortable.active = null;
+			lastCSS =
-			}
-		},
 
+			activeGroup =
+			Sortable.active = null;
+		},
 
 		handleEvent: function (/**Event*/evt) {
 			var type = evt.type;

ng-sortable.js

@@ -149,7 +149,7 @@
 						return opts;
 					}, {
 						onStart: function (/**Event*/evt) {
-							nextSibling = evt.item.nextSibling;
+							nextSibling = evt.from === evt.item.parentNode ? evt.item.nextSibling : evt.clone.nextSibling;
 							_emitEvent(evt);
 							scope.$apply();
 						},