Merge remote-tracking branch 'origin/master' into gi

# Conflicts:
#	Source/Editor/Windows/Assets/VisualScriptWindow.cs

Source/Engine/Core/Collections/Dictionary.h

@@ -245,6 +245,7 @@ public:
         Dictionary& _collection;
         int32 _index;
 
+    public:
         Iterator(Dictionary& collection, const int32 index)
             : _collection(collection)
             , _index(index)
@@ -257,8 +258,6 @@ public:
         {
         }
 
-    public:
-
         Iterator(const Iterator& i)
             : _collection(i._collection)
             , _index(i._index)
@@ -272,6 +271,10 @@ public:
         }
 
     public:
+        FORCE_INLINE int32 Index() const
+        {
+            return _index;
+        }
 
         FORCE_INLINE bool IsEnd() const
         {