Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Conflicts:
	Babylon/babylon.scene.ts

Babylon/Actions/babylon.actionManager.ts

@@ -175,6 +175,9 @@
                 if (action.trigger >= ActionManager._OnPickTrigger && action.trigger <= ActionManager._OnPointerOutTrigger) {
                     return true;
                 }
+                if (action.trigger == ActionManager._OnPickUpTrigger) {
+                    return true;
+                }
             }
 
             return false;
@@ -191,6 +194,9 @@
                 if (action.trigger >= ActionManager._OnPickTrigger && action.trigger <= ActionManager._OnCenterPickTrigger) {
                     return true;
                 }
+                if (action.trigger == ActionManager._OnPickUpTrigger) {
+                    return true;
+                }
             }
 
             return false;
@@ -262,4 +268,4 @@
             return properties[properties.length - 1];
         }
     }
-} 
+}