Merge branch 'master' into merge-2.054

Conflicts:
	gen/statements.cpp (returning void from main() was fixed on both branches)

gen/nested.cpp

@@ -396,6 +396,9 @@ static void DtoCreateNestedContextType(FuncDeclaration* fd) {
             unsigned depth = -1;
             if (!fd->isStatic()) {
                 if (FuncDeclaration* parfd = getParentFunc(fd, true)) {
+                    // Make sure parfd->ir.irFunc has already been set.
+                    DtoDeclareFunction(parfd);
+
                     innerFrameType = parfd->ir.irFunc->frameType;
                     if (innerFrameType)
                         depth = parfd->ir.irFunc->depth;