Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Classes/PHPExcel/Calculation/Functions.php
#	Classes/PHPExcel/Worksheet.php
#	Classes/PHPExcel/Worksheet/CellIterator.php

Author: MarkBaker

Classes/PHPExcel/Calculation/Functions.php

@@ -518,15 +518,14 @@ public static function IS_NONTEXT($value = null)
     }
 
 
-    /**
-     * VERSION
-     *
-     * @return    string    Version information
-     */
-    public static function VERSION()
-    {
-        return 'PHPExcel ##VERSION##, ##DATE##';
-    }
+	/**
+	 * VERSION
+	 *
+	 * @return	string	Version information
+	 */
+	public static function VERSION() {
+		return 'PHPExcel 1.8.2, 2018-11-22';
+	}	//	function VERSION()
 
 
     /**

Classes/PHPExcel/Worksheet/CellIterator.php

@@ -70,7 +70,7 @@ public function getIterateOnlyExistingCells()
      * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
      *
      * @throws PHPExcel_Exception
-     */
+	 */
     abstract protected function adjustForExistingOnlyRange();
 
     /**