diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 1b44415f..830fecbb 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,6 @@ int yyFlexLexer::yywrap()
 one_space                  [ \t\f]
 space                      {one_space}*
 some_space                 {one_space}+
-cspace                     ","{space}
 
 alpha                      [_[:alpha:]]
 digit                      [[:digit:]]
@@ -150,6 +149,7 @@ rbrac                      ")"
 quote                      \"
 dash                       "-"
 dotColonDash               [.:-]
+commaPipe                  [,\|]
 
 schemeSpecialInitial       [!$%&*/\\:<=>?~_^#.@']
 schemeSpecialSubsequent    [.+-]
@@ -164,6 +164,7 @@ zeroLabel                  {digit}*
 signedInteger              [-+]?{integer}
 word                       ({alpha}|{digit}|{dotColonDash})*
 wordBraces                 ({word}|{lbrac}|{rbrac})*
+wordBracesExtras           ({word}|{lbrac}|{rbrac}|{commaPipe})*
 
 exponent_part              [eE][-+]?{digit}+
 fractional_constant        [-+]?(({digit}*"."{digit}+)|({digit}+".")|({digit}))
@@ -186,6 +187,8 @@ schemeSymbolList           ({schemeSymbolListElement}+{space})
 starStar                   ("**")
 text                       ({space}({word}*{space})*)
 textBraces                 ({space}({wordBraces}*{space})*)
+textExtras                 ({space}({word}*{commaPipe}{space})*)
+textBracesExtras           ({space}({wordBracesExtras}*{space})*)
 anythingInBlock            ([^)]*)
 
 dateDDMMYYYY               ({digit}{digit}"/"{digit}{digit}"/"{digit}{digit}{digit}{digit})
@@ -278,7 +281,7 @@ endOfSection               {space}")"{space}
         BEGIN(readHeader);
     }
 
-<readHeader>{quote}{textBraces}{quote} {
+<readHeader>{quote}{textBracesExtras}{quote} {
         Info<< "Reading header: " << YYText() << endl;
     }
 
@@ -604,7 +607,7 @@ endOfSection               {space}")"{space}
 
 <readCellData>{space}{lbrac} {
         // Quickly scan to the end of the cell data block and discard
-        register int c;
+        int c;
         while ((c = yyinput()) != 0 && c != ')')
         {}
     }
@@ -727,6 +730,8 @@ endOfSection               {space}")"{space}
 <ignoreBlock,ignoreEmbeddedBlock>{space}{text} {
     }
 
+<ignoreBlock,ignoreEmbeddedBlock>{space}{textExtras} {
+    }
 
  /* ------              Count newlines.                              ------  */
 
@@ -814,7 +819,7 @@ int main(int argc, char *argv[])
     }
 
 
-#   include "createTime.H"
+    #include "createTime.H"
 
     const fileName fluentFile = args[1];
     IFstream fluentStream(fluentFile);