Merge remote-tracking branch 'origin/4.x-dev' into 4.x-dev

# Conflicts:
#	composer.json

Author: Hackwar

docs/array-helper.md

@@ -376,7 +376,7 @@ $array = array(
 // Flatten the nested array and separate the keys by a dot (".")
 $flattenend1 = ArrayHelper::flatten($array);
 
-echo $flattenend1['flower.sakura']; // 'samuari'
+echo $flattenend1['flower.sakura']; // 'samurai'
 
 // Custom separator
 $flattenend2 = ArrayHelper::flatten($array, '/');