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

# Conflicts:
#	src/NHibernate/Async/Impl/MultiCriteriaImpl.cs
#	src/NHibernate/Async/Impl/MultiQueryImpl.cs
#	src/NHibernate/Async/Loader/Loader.cs
#	src/NHibernate/Async/Multi/QueryBatchItemBase.cs
#	src/NHibernate/Impl/MultiCriteriaImpl.cs
#	src/NHibernate/Impl/MultiQueryImpl.cs
#	src/NHibernate/Loader/Loader.cs
#	src/NHibernate/Multi/QueryBatchItemBase.cs

Author: maca88

src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs

@@ -395,6 +395,23 @@ public void SkipRootEntityIsNotSupportedAsync()
 			}
 		}
 
+		[Test]
+		public async Task OrderedInnerJoinFetchAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var list = await (session.QueryOver<EntityComplex>()
+					.Where(ec => ec.Id == _parentEntityComplexId)
+					.JoinQueryOver(c => c.ChildrenList).Fetch(SelectMode.Fetch, child => child)
+					.TransformUsing(Transformers.DistinctRootEntity)
+					.ListAsync());
+
+				var childList = list[0].ChildrenList;
+				Assert.That(list[0].ChildrenList.Count, Is.GreaterThan(1));
+				Assert.That(list[0].ChildrenList, Is.EqualTo(list[0].ChildrenList.OrderByDescending(c => c.OrderIdx)), "wrong order");
+			}
+		}
+
 		[Test, Obsolete]
 		public async Task FetchModeEagerForLazyAsync()
 		{
@@ -562,15 +579,19 @@ protected override HbmMapping GetMappings()
 						m.Column("SameTypeChildId");
 						m.ForeignKey("none");
 					});
-					MapList(rc, ep => ep.ChildrenList);
+					MapList(rc, ep => ep.ChildrenList, mapper: m => m.OrderBy("OrderIdx desc"));
 					MapList(rc, ep => ep.ChildrenListEmpty);
 				});
 
 			MapSimpleChild(
 				mapper,
 				default(EntitySimpleChild),
 				c => c.Children,
-				rc => { rc.Property(sc => sc.LazyProp, mp => mp.Lazy(true)); });
+				rc =>
+				{
+					rc.Property(sc => sc.LazyProp, mp => mp.Lazy(true));
+					rc.Property(sc => sc.OrderIdx);
+				});
 			MapSimpleChild(mapper, default(Level2Child), c => c.Children);
 			MapSimpleChild<Level3Child>(mapper);
 
@@ -598,7 +619,7 @@ private static void MapSimpleChild<TChild, TSubChild>(ModelMapper mapper, TChild
 				});
 		}
 
-		private static void MapList<TParent, TElement>(IClassMapper<TParent> rc, Expression<Func<TParent, IEnumerable<TElement>>> expression, CollectionFetchMode fetchMode =  null) where TParent : class
+		private static void MapList<TParent, TElement>(IClassMapper<TParent> rc, Expression<Func<TParent, IEnumerable<TElement>>> expression, CollectionFetchMode fetchMode =  null, Action<IBagPropertiesMapper<TParent, TElement>> mapper = null) where TParent : class
 		{
 			rc.Bag(
 				expression,
@@ -620,6 +641,7 @@ private static void MapList<TParent, TElement>(IClassMapper<TParent> rc, Express
 					{
 						m.Fetch(fetchMode);
 					}
+					mapper?.Invoke(m);
 				},
 				a => a.OneToMany());
 		}
@@ -682,7 +704,8 @@ protected override void OnSetUp()
 								},
 							}
 						}
-					}
+					},
+					OrderIdx = 100
 				};
 
 				var child2 = new EntitySimpleChild
@@ -691,6 +714,17 @@ protected override void OnSetUp()
 					LazyProp = "LazyFromSimpleChild2",
 				};
 
+				var child3 = new EntitySimpleChild
+				{
+					Name = "Child3",
+					OrderIdx = 0
+				};
+				var child4 = new EntitySimpleChild
+				{
+					Name = "Child4",
+					OrderIdx = 50
+				};
+
 				var parent = new EntityComplex
 				{
 					Name = "ComplexEntityParent",
@@ -701,7 +735,7 @@ protected override void OnSetUp()
 					{
 						Name = "ComplexEntityChild"
 					},
-					ChildrenList = new List<EntitySimpleChild> {child1},
+					ChildrenList = new List<EntitySimpleChild> {child3, child1, child4 },
 					ChildrenListEmpty = new List<EntityComplex> { },
 				};
 				session.Save(new EntityEager()