Merge branch 'master' of https://github.com/yiisoft/yii2

framework/helpers/base/ArrayHelper.php

@@ -349,4 +349,4 @@ class ArrayHelper
 		}
 		return $d;
 	}
-}
+}

framework/helpers/base/FileHelper.php

@@ -169,4 +169,4 @@ class FileHelper
 		}
 		closedir($handle);
 	}
-}
+}

framework/helpers/base/Json.php

@@ -104,4 +104,4 @@ class Json
 			return $data;
 		}
 	}
-}
+}

framework/helpers/base/VarDumper.php

@@ -131,4 +131,4 @@ class VarDumper
 				break;
 		}
 	}
-}
+}