Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

diff --cc src/qml/jsruntime/qv4engine.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4regexpobject.cpp
index 6f7281d,95b6569..1b93542
--- 1/src/qml/jsruntime/qv4regexpobject.cpp
--- 2/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@@ -348,10 -391,9 +391,9 @@@ ReturnedValue RegExpPrototype::method_e
          int start = matchOffsets[i * 2];
          int end = matchOffsets[i * 2 + 1];
          v = (start != -1 && end != -1) ? ctx->engine->newString(s.mid(start, end - start))->asReturnedValue() : Encode::undefined();
 -        array->arrayData->put(i, v);
 +        array->arrayPut(i, v);
      }
      array->setArrayLengthUnchecked(len);
- 
      array->memberData[Index_ArrayIndex].value = Primitive::fromInt32(result);
      array->memberData[Index_ArrayInput].value = arg.asReturnedValue();